From 8d6af808a7e9d9ae1d129e1e5a0def7f8b2333ee Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 2 Sep 2016 14:19:51 +0200 Subject: [PATCH] memory: fix compat handling of XENMEM_access_op Within compat_memory_op() this needs to be placed in the first switch() statement, or it ends up being dead code (as that first switch() has a default case chaining to compat_arch_memory_op()). Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper --- xen/common/compat/memory.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 20c7671ffe..579040ea1f 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -320,6 +320,11 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; } + case XENMEM_access_op: + return mem_access_memop(cmd, + guest_handle_cast(compat, + xen_mem_access_op_t)); + case XENMEM_get_vnumainfo: { enum XLAT_vnuma_topology_info_vdistance vdistance = @@ -495,10 +500,6 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; } - case XENMEM_access_op: - rc = mem_access_memop(cmd, guest_handle_cast(compat, xen_mem_access_op_t)); - break; - case XENMEM_add_to_physmap_batch: start_extent = end_extent; break; -- 2.30.2